*** empty log message ***

diff --git a/src/ChangeLog b/src/ChangeLog
index c6368afb0acd438d08c0573064de9dc4e2094ac0..b4c07c00bb14316eb7f997215e1b7f79c57b0926 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,13 +1,17 @@
 2007-02-22  Jason Rumney  <jasonr@gnu.org>
 
+       * w32fns.c (w32_wnd_proc) [WM_INITMENU]: Set menubar_active frame
+       parameter.
+
        * w32menu.c (current_popup_menu): Make available globally.
        (menubar_selection_callback): Free menu strings before pushing the
        menu event into the keyboard buffer.  Remove
        menu_command_in_progress.
 
        * w32fns.c (current_popup_menu): Use from w32menu.c.
-       (w32_wnd_proc): Use menubar_active and current_popup_menu to
-       determine whether a menubar menu has been cancelled.
+       (w32_wnd_proc) [WM_EXITMENULOOP, WM_TIMER]: Use menubar_active
+       and current_popup_menu to determine whether a menubar menu has
+       been cancelled.
 
        * w32term.h (w32_output): Remove menu_command_in_progress.